Fix another corner case in the build system.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/.hgignore b/.hgignore
index 106adb5410ab801dcde3b99761bddadf6d02b33b..1d6138311f5488c7a885b76e99e0e5819a7777af 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -14,7 +14,6 @@
 .*\.orig$
 .*\.rej$
 ^[^/]*\.bz2$
-^\.valid-srcs$
 ^TAGS$
 ^dist/.*$
 ^docs/.*\.aux$
@@ -68,6 +67,7 @@
 ^patches/tmp/.*$
 ^pristine-.*$
 ^ref-.*$
+^tmp-.*$
 ^tools/.*/TAGS$
 ^tools/.*/build/lib.*/.*\.py$
 ^tools/blktap/Makefile\.smh$

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 3a44387f22eaaa3fa276c24274db7a88566621ab..a940cff25afce0c299e94eb15d9b48e3cfa3f14e 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -22,18 +22,18 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
 
-.valid-srcs: $(LINUX_SRCS)
-       touch $@
-
-pristine-linux-%.16-rc1-git4/.valid-pristine: .valid-srcs
+pristine-$(LINUX_PDIR)/.valid-srcs: $(LINUX_SRCS)
        rm -rf tmp-pristine-$(LINUX_PDIR) $(@D)
        mkdir -p tmp-pristine-$(LINUX_PDIR)
-       tar -C tmp-pristine-$(LINUX_PDIR) -jxf $(word 1,$(LINUX_SRCS))
+       tar -C tmp-pristine-$(LINUX_PDIR) -jxf $(word 1,$<)
        -@rm tmp-pristine-$(LINUX_PDIR)/pax_global_header
        mv tmp-pristine-$(LINUX_PDIR)/* $(@D)
        @rm -rf tmp-pristine-$(LINUX_PDIR)
-       bzcat $(wordlist 2,$(words $(LINUX_SRCS)),$(LINUX_SRCS)) | patch -d $(@D) -p1
+       bzcat $(wordlist 2,$(words $<),$<) | patch -d $(@D) -p1
        touch $(@D)/.hgskip
+       touch $@
+
+pristine-linux-%.16-rc1-git4/.valid-pristine: pristine-$(LINUX_PDIR)/.valid-srcs
        touch $@ # update timestamp to avoid rebuild
 
 $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref